From f2943ec6c4a488639df9874a1a430da1801dde67 Mon Sep 17 00:00:00 2001
From: jfatherton <jfatherton@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sat, 14 Aug 2004 16:07:44 +0000
Subject: [PATCH] Added gui access to smart names

---
 .../English.lproj/MainMenu.nib/info.nib       |   8 +-
 .../English.lproj/MainMenu.nib/objects.nib    | Bin 21280 -> 22255 bytes
 gpsbabel/macgpsbabel/MacGPSBabel.applescript  |  54 +-
 .../MacGPSBabel.pbproj/jeremya.pbxuser        | 546 +++++++++++++++---
 .../MacGPSBabel.pbproj/project.pbxproj        |   2 +-
 5 files changed, 512 insertions(+), 98 deletions(-)

diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
index e96c951ae..035a88d62 100644
--- a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
+++ b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
@@ -8,14 +8,14 @@
 		<string>69 252 302 44 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
-	<string>283.0</string>
+	<string>291.0</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>305</integer>
+		<integer>229</integer>
+		<integer>21</integer>
 		<integer>29</integer>
+		<integer>305</integer>
 		<integer>678</integer>
-		<integer>21</integer>
-		<integer>229</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>6R73</string>
diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib
index 8f8edf1d1c62a02e778c5ce8c8530054e5edb482..bd6af5e3968fa3bb95323f05f21020144a36668e 100644
GIT binary patch
literal 22255
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

literal 21280
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

diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.applescript b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
index 72c2926cb..c7d352a2c 100644
--- a/gpsbabel/macgpsbabel/MacGPSBabel.applescript
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
@@ -209,6 +209,18 @@ on clicked theObject
 		end if
 	end if
 	
+	-- Filter Window - Smart names check box
+	if theObject is the button "smartSwitch" of window "filterWindow" then
+		if state of button "smartSwitch" of window "filterWindow" is equal to 1 then
+			set enabled of text field "smartLen" of window "filterWindow" to true
+			set editable of text field "smartLen" of window "filterWindow" to true
+			set contents of text field "smartLen" of window "filterWindow" to ""
+		else
+			set enabled of text field "smartLen" of window "filterWindow" to false
+			set editable of text field "smartLen" of window "filterWindow" to false
+		end if
+	end if
+	
 	--debug mode
 	if theObject is the button "debugButton" of window "MacGPSBabel" then
 		if (visible of window "debugWindow") is false then
@@ -300,6 +312,18 @@ on convertFile(fileList)
 	-- create strings for output file
 	set currentOutIndex to contents of popup button "outPop" of window "MacGPSBabel"
 	set outType to item (currentOutIndex) of typeList
+	if visible of window "filterWindow" is true then
+		if state of button "smartSwitch" of window "filterWindow" is equal to 1 then
+			set smartSwitch to " -s"
+			if contents of text field "smartLen" of window "filterWindow" is not equal to "" then
+				set outType to outType & ",snlen=" & ((contents of text field "smartLen" of window "filterWindow") as integer) & " "
+			end if
+		else
+			set smartSwitch to ""
+		end if
+	else
+		set smartSwitch to ""
+	end if
 	set OutExt to item (currentOutIndex) of extList
 	-- set outPath to directory of aFile
 	tell save panel
@@ -327,7 +351,7 @@ on convertFile(fileList)
 	feedbackBusy(true)
 	-- do the script
 	set thePath to POSIX path of (path to me) as string
-	set theConvertScript to (quoted form of thePath & "Contents/Resources/gpsbabel" & fileText & " " & filterText & "-o " & outType & " -F " & quoted form of outputFile) as string
+	set theConvertScript to (quoted form of thePath & "Contents/Resources/gpsbabel" & smartSwitch & fileText & " " & filterText & "-o " & outType & " -F " & quoted form of outputFile) as string
 	try
 		set scriptOut to do shell script theConvertScript as string
 		set convertYN to "Conversion Completed Successfully"
@@ -378,6 +402,18 @@ on uploadFile(fileList)
 	else
 		set gpsText to " magellan "
 	end if
+	if visible of window "filterWindow" is true then
+		if state of button "smartSwitch" of window "filterWindow" is equal to 1 then
+			set smartSwitch to " -s"
+			if contents of text field "smartLen" of window "filterWindow" is not equal to "" then
+				set gpsText to gpsText & ",snlen=" & ((contents of text field "smartLen" of window "filterWindow") as integer) & " "
+			end if
+		else
+			set smartSwitch to ""
+		end if
+	else
+		set smartSwitch to ""
+	end if
 	
 	-- run the script
 	set thePath to POSIX path of (path to me) as string
@@ -385,7 +421,7 @@ on uploadFile(fileList)
 	set visible of window "MacGPSBabel" to true
 	feedbackBusy(true)
 	set serialText to "-F /dev/cu." & (the title of popup button "serialPop" of window "selectGPS")
-	do shell script (quoted form of thePath & "Contents/Resources/gpsbabel" & fileText & " " & filterText & "-o " & gpsText & serialText)
+	do shell script (quoted form of thePath & "Contents/Resources/gpsbabel" & smartSwitch & fileText & " " & filterText & "-o " & gpsText & serialText)
 	feedbackBusy(false)
 	display dialog "Upload Complete" buttons {"OK"} default button 1
 end uploadFile
@@ -413,6 +449,18 @@ on downloadFile()
 	
 	set currentOutIndex to contents of popup button "outPop" of window "MacGPSBabel"
 	set outType to item (currentOutIndex) of typeList
+	if visible of window "filterWindow" is true then
+		if state of button "smartSwitch" of window "filterWindow" is equal to 1 then
+			set smartSwitch to " -s"
+			if contents of text field "smartLen" of window "filterWindow" is not equal to "" then
+				set outType to outType & ",snlen=" & ((contents of text field "smartLen" of window "filterWindow") as integer) & " "
+			end if
+		else
+			set smartSwitch to ""
+		end if
+	else
+		set smartSwitch to ""
+	end if
 	set OutExt to item (currentOutIndex) of extList
 	set TempFileName to outName & OutExt
 	set theResult to display save panel in directory "~/Desktop" with file name TempFileName
@@ -427,7 +475,7 @@ on downloadFile()
 		set visible of window "SelectGPS" to false
 		set visible of window "MacGPSBabel" to true
 		feedbackBusy(true)
-		do shell script (quoted form of thePath & "Contents/Resources/gpsbabel" & trackText & " -i" & gpsText & "-f " & serialText & " " & filterText & " -o " & outType & " -F " & quoted form of outputFile)
+		do shell script (quoted form of thePath & "Contents/Resources/gpsbabel" & smartSwitch & trackText & " -i" & gpsText & "-f " & serialText & " " & filterText & " -o " & outType & " -F " & quoted form of outputFile)
 		feedbackBusy(false)
 		display dialog "Download from GPS is complete" buttons {"OK"} default button 1
 	else
diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
index 1f4dc2c94..3fbd8573f 100644
--- a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
@@ -13,7 +13,7 @@
 			DA206CF0015C4D9F03C91932,
 		);
 		perUserDictionary = {
-			PBXPerProjectTemplateStateSaveDate = 112497554;
+			PBXPerProjectTemplateStateSaveDate = 114188516;
 			"PBXTemplateGeometry-F5314676015831810DCA290F" = {
 				ContentSize = "{685, 434}";
 				LeftSlideOut = {
@@ -153,7 +153,7 @@
 						Collapsed = YES;
 						Frame = "{{0, 0}, {594, 280}}";
 						Split0 = {
-							Frame = "{{1e+06, 1e+06}, {594, 27}}";
+							Frame = "{{1e+06, 1e+06}, {594, 0}}";
 						};
 						SplitCount = 1;
 						Tab0 = {
@@ -276,17 +276,17 @@
 						Split0 = {
 							Split0 = {
 								NavContent0 = {
-									bookmark = 3F2FDB0906B4943500A80064;
+									bookmark = 3F6587EF06CE7003007C6F9A;
 									history = (
 										F5E2D67E05CDA550017C67C1,
 										F5E2D67F05CDA550017C67C1,
 										F5E2D68005CDA550017C67C1,
 										F5EAB15305FF78D401A80065,
-										3F7037A506B335A800A80064,
 										3F7037A606B335A800A80064,
 										3F7037A706B335A800A80064,
-										3F2FDB0606B4943500A80064,
-										3F2FDB0706B4943500A80064,
+										3F10FD0506CC4D6D00A80064,
+										3F10FD0606CC4D6D00A80064,
+										3F6587EE06CE7003007C6F9A,
 									);
 									prevStack = (
 										F5F16EF80527D1B401A80064,
@@ -400,6 +400,12 @@
 										3F7037AA06B335A800A80064,
 										3F7037AB06B335A800A80064,
 										3F2FDB0806B4943500A80064,
+										3F5F093C06B4953400A80064,
+										3F10FD0806CC4D6D00A80064,
+										3F10FD0906CC4D6D00A80064,
+										3F10FD0A06CC4D6D00A80064,
+										3F10FD0B06CC4D6D00A80064,
+										3F10FD0C06CC4D6D00A80064,
 									);
 								};
 								NavCount = 1;
@@ -434,6 +440,78 @@
 						TabCount = 5;
 					};
 				},
+				{
+					LeftSlideOut = {
+						Split0 = {
+							Split0 = {
+								NavCount = 1;
+								NavGeometry0 = {
+									Frame = "{{0, 0}, {685, 150}}";
+									NavBarVisible = YES;
+								};
+								NavSplitVertical = NO;
+							};
+							SplitCount = 1;
+							Tab1 = {
+								Debugger = {
+									Split0 = {
+										SplitCount = 2;
+									};
+									SplitCount = 1;
+									TabCount = 2;
+								};
+								LauncherConfigVersion = 7;
+							};
+							Tab2 = {
+								LauncherConfigVersion = 3;
+								Runner = {
+								};
+							};
+							TabCount = 5;
+						};
+						SplitCount = 1;
+						Tab1 = {
+							OptionsSetName = "Hierarchy, all classes";
+						};
+						TabCount = 5;
+					};
+				},
+				{
+					LeftSlideOut = {
+						Split0 = {
+							Split0 = {
+								NavCount = 1;
+								NavGeometry0 = {
+									Frame = "{{0, 0}, {594, 150}}";
+									NavBarVisible = YES;
+								};
+								NavSplitVertical = NO;
+							};
+							SplitCount = 1;
+							Tab1 = {
+								Debugger = {
+									Split0 = {
+										SplitCount = 2;
+									};
+									SplitCount = 1;
+									TabCount = 2;
+								};
+								LauncherConfigVersion = 7;
+							};
+							Tab2 = {
+								LauncherConfigVersion = 3;
+								Runner = {
+								};
+							};
+							TabCount = 5;
+						};
+						SplitCount = 1;
+						Tab1 = {
+							OptionsSetName = "Hierarchy, all classes";
+						};
+						TabCount = 5;
+					};
+				},
 			);
 			PBXWorkspaceGeometries = (
 				{
@@ -566,21 +644,283 @@
 					ToolbarVisible = YES;
 					WindowLocation = "{3, 0}";
 				},
+				{
+					ContentSize = "{685, 434}";
+					LeftSlideOut = {
+						Collapsed = NO;
+						Frame = "{{0, 23}, {685, 411}}";
+						Split0 = {
+							ActiveTab = 2;
+							ActiveTabName = PBXBuildResultsModule;
+							Collapsed = NO;
+							Frame = "{{0, 0}, {685, 411}}";
+							Split0 = {
+								Frame = "{{0, 301}, {685, 110}}";
+							};
+							SplitCount = 1;
+							Tab0 = {
+								Frame = "{{0, 0}, {952, 321}}";
+							};
+							Tab1 = {
+								Debugger = {
+									Collapsed = NO;
+									Frame = "{{0, 0}, {781, 452}}";
+									Split0 = {
+										Frame = "{{0, 24}, {781, 428}}";
+										Split0 = {
+											Frame = "{{0, 0}, {383, 428}}";
+										};
+										Split1 = {
+											DebugVariablesTableConfiguration = (
+												Name,
+												123,
+												Value,
+												85,
+												Summary,
+												155.123,
+											);
+											Frame = "{{392, 0}, {389, 428}}";
+										};
+										SplitCount = 2;
+									};
+									SplitCount = 1;
+									Tab0 = {
+										Frame = "{{0, 0}, {100, 50}}";
+									};
+									Tab1 = {
+										Frame = "{{0, 0}, {100, 50}}";
+									};
+									TabCount = 2;
+									TabsVisible = YES;
+								};
+								Frame = "{{0, 0}, {781, 452}}";
+								LauncherConfigVersion = 7;
+							};
+							Tab2 = {
+								Frame = "{{0, 0}, {685, 215}}";
+								LauncherConfigVersion = 3;
+								Runner = {
+									Frame = "{{0, 0}, {685, 215}}";
+								};
+							};
+							Tab3 = {
+								BuildMessageFrame = "{{0, 0}, {687, 262}}";
+								BuildTranscriptFrame = "{{0, 271}, {687, 2}}";
+								BuildTranscriptFrameExpanded = YES;
+								Frame = "{{0, 0}, {685, 295}}";
+							};
+							Tab4 = {
+								Frame = "{{0, 0}, {612, 295}}";
+							};
+							TabCount = 5;
+							TabsVisible = NO;
+						};
+						SplitCount = 1;
+						Tab0 = {
+							Frame = "{{0, 0}, {300, 533}}";
+							GroupTreeTableConfiguration = (
+								TargetStatusColumn,
+								18,
+								MainColumn,
+								267,
+							);
+						};
+						Tab1 = {
+							ClassesFrame = "{{0, 0}, {280, 398}}";
+							ClassesTreeTableConfiguration = (
+								PBXBookColumnIdentifier,
+								20,
+								PBXClassColumnIdentifier,
+								237,
+							);
+							Frame = "{{0, 0}, {278, 659}}";
+							MembersFrame = "{{0, 407}, {280, 252}}";
+							MembersTreeTableConfiguration = (
+								PBXBookColumnIdentifier,
+								20,
+								PBXMethodColumnIdentifier,
+								236,
+							);
+						};
+						Tab2 = {
+							Frame = "{{0, 0}, {200, 100}}";
+						};
+						Tab3 = {
+							Frame = "{{0, 0}, {200, 100}}";
+							TargetTableConfiguration = (
+								ActiveObject,
+								16,
+								ObjectNames,
+								202.296,
+							);
+						};
+						Tab4 = {
+							BreakpointsTreeTableConfiguration = (
+								breakpointColumn,
+								197,
+								enabledColumn,
+								31,
+							);
+							Frame = "{{0, 0}, {250, 100}}";
+						};
+						TabCount = 5;
+						TabsVisible = NO;
+					};
+					NavBarShownByDefault = YES;
+					StatusViewVisible = YES;
+					Template = F5314676015831810DCA290F;
+					ToolbarVisible = YES;
+					WindowLocation = "{7, 250}";
+				},
+				{
+					ContentSize = "{594, 303}";
+					LeftSlideOut = {
+						Collapsed = NO;
+						Frame = "{{0, 23}, {594, 280}}";
+						Split0 = {
+							ActiveTab = 1;
+							ActiveTabName = PBXRunSessionModule;
+							Collapsed = YES;
+							Frame = "{{0, 0}, {594, 280}}";
+							Split0 = {
+								Frame = "{{1e+06, 1e+06}, {594, 0}}";
+							};
+							SplitCount = 1;
+							Tab0 = {
+								Frame = "{{0, 0}, {804, 321}}";
+							};
+							Tab1 = {
+								Debugger = {
+									Collapsed = NO;
+									Frame = "{{0, 0}, {594, 274}}";
+									Split0 = {
+										Frame = "{{0, 24}, {594, 250}}";
+										Split0 = {
+											Frame = "{{0, 0}, {290, 250}}";
+										};
+										Split1 = {
+											DebugVariablesTableConfiguration = (
+												Name,
+												123,
+												Value,
+												85,
+												Summary,
+												62.123,
+											);
+											Frame = "{{299, 0}, {295, 250}}";
+										};
+										SplitCount = 2;
+									};
+									SplitCount = 1;
+									Tab0 = {
+										Frame = "{{0, 0}, {100, 50}}";
+									};
+									Tab1 = {
+										Frame = "{{0, 0}, {100, 50}}";
+									};
+									TabCount = 2;
+									TabsVisible = YES;
+								};
+								Frame = "{{0, 0}, {594, 274}}";
+								LauncherConfigVersion = 7;
+							};
+							Tab2 = {
+								Frame = "{{0, 0}, {594, 274}}";
+								LauncherConfigVersion = 3;
+								Runner = {
+									Frame = "{{0, 0}, {594, 274}}";
+								};
+							};
+							Tab3 = {
+								BuildMessageFrame = "{{0, 0}, {614, 262}}";
+								BuildTranscriptFrame = "{{0, 271}, {614, 2}}";
+								BuildTranscriptFrameExpanded = YES;
+								Frame = "{{0, 0}, {612, 295}}";
+							};
+							Tab4 = {
+								Frame = "{{0, 0}, {612, 295}}";
+							};
+							TabCount = 5;
+							TabsVisible = NO;
+						};
+						SplitCount = 1;
+						Tab0 = {
+							Frame = "{{0, 0}, {300, 533}}";
+							GroupTreeTableConfiguration = (
+								TargetStatusColumn,
+								18,
+								MainColumn,
+								267,
+							);
+						};
+						Tab1 = {
+							ClassesFrame = "{{0, 0}, {280, 398}}";
+							ClassesTreeTableConfiguration = (
+								PBXBookColumnIdentifier,
+								20,
+								PBXClassColumnIdentifier,
+								237,
+							);
+							Frame = "{{0, 0}, {278, 659}}";
+							MembersFrame = "{{0, 407}, {280, 252}}";
+							MembersTreeTableConfiguration = (
+								PBXBookColumnIdentifier,
+								20,
+								PBXMethodColumnIdentifier,
+								236,
+							);
+						};
+						Tab2 = {
+							Frame = "{{0, 0}, {200, 100}}";
+						};
+						Tab3 = {
+							Frame = "{{0, 0}, {200, 386}}";
+							TargetTableConfiguration = (
+								ActiveObject,
+								16,
+								ObjectNames,
+								202.296,
+							);
+						};
+						Tab4 = {
+							BreakpointsTreeTableConfiguration = (
+								breakpointColumn,
+								197,
+								enabledColumn,
+								31,
+							);
+							Frame = "{{0, 0}, {250, 386}}";
+						};
+						TabCount = 5;
+						TabsVisible = NO;
+					};
+					NavBarShownByDefault = YES;
+					StatusViewVisible = YES;
+					Template = F5534CB2020F3F8A0DCA290F;
+					ToolbarVisible = YES;
+					WindowLocation = "{4, 381}";
+				},
 			);
-			PBXWorkspaceStateSaveDate = 112497554;
+			PBXWorkspaceStateSaveDate = 114188516;
 		};
 		perUserProjectItems = {
 			3F0A602B062B681C007C67C1 = 3F0A602B062B681C007C67C1;
 			3F0A602C062B681C007C67C1 = 3F0A602C062B681C007C67C1;
 			3F0A602D062B681C007C67C1 = 3F0A602D062B681C007C67C1;
 			3F0BDAD706AF6C1F00A80064 = 3F0BDAD706AF6C1F00A80064;
-			3F2FDB0606B4943500A80064 = 3F2FDB0606B4943500A80064;
-			3F2FDB0706B4943500A80064 = 3F2FDB0706B4943500A80064;
+			3F10FD0506CC4D6D00A80064 = 3F10FD0506CC4D6D00A80064;
+			3F10FD0606CC4D6D00A80064 = 3F10FD0606CC4D6D00A80064;
+			3F10FD0806CC4D6D00A80064 = 3F10FD0806CC4D6D00A80064;
+			3F10FD0906CC4D6D00A80064 = 3F10FD0906CC4D6D00A80064;
+			3F10FD0A06CC4D6D00A80064 = 3F10FD0A06CC4D6D00A80064;
+			3F10FD0B06CC4D6D00A80064 = 3F10FD0B06CC4D6D00A80064;
+			3F10FD0C06CC4D6D00A80064 = 3F10FD0C06CC4D6D00A80064;
 			3F2FDB0806B4943500A80064 = 3F2FDB0806B4943500A80064;
-			3F2FDB0906B4943500A80064 = 3F2FDB0906B4943500A80064;
 			3F579AB40645EEDF007C6F93 = 3F579AB40645EEDF007C6F93;
 			3F579AB50645EEDF007C6F93 = 3F579AB50645EEDF007C6F93;
-			3F7037A506B335A800A80064 = 3F7037A506B335A800A80064;
+			3F5F093C06B4953400A80064 = 3F5F093C06B4953400A80064;
+			3F6587EE06CE7003007C6F9A = 3F6587EE06CE7003007C6F9A;
+			3F6587EF06CE7003007C6F9A = 3F6587EF06CE7003007C6F9A;
 			3F7037A606B335A800A80064 = 3F7037A606B335A800A80064;
 			3F7037A706B335A800A80064 = 3F7037A706B335A800A80064;
 			3F7037A806B335A800A80064 = 3F7037A806B335A800A80064;
@@ -710,7 +1050,7 @@
 		rLen = 0;
 		rLoc = 6066;
 		rType = 0;
-		vrLen = 1911;
+		vrLen = 1874;
 		vrLoc = 4192;
 	};
 	3F0A602C062B681C007C67C1 = {
@@ -732,73 +1072,79 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 301";
 		rLen = 0;
-		rLoc = 13627;
+		rLoc = 14214;
 		rType = 0;
 		vrLen = 1839;
 		vrLoc = 0;
 	};
-	3F2FDB0606B4943500A80064 = {
+	3F10FD0506CC4D6D00A80064 = {
 		isa = PBXTargetBookmark;
 		trg = 29B97326FDCFA39411CA2CEA;
-		uiCtxt = {
-			TOCViewDetailVisibleRect = "{{0, 0}, {590, 233}}";
-			TOCViewExpandedItems = (
-				"com.apple.target-editor-pane.settings",
-				"com.apple.target-editor-pane.settings.simple",
-				"com.apple.target-editor-pane.info-plist",
-				"com.apple.target-editor-pane.info-plist.simple",
-				"com.apple.target-editor-pane.buildphases",
-			);
-			TOCViewMasterVisibleRect = "{{0, 0}, {235, 607}}";
-			TOCViewSelectedItems = (
-				PBXTargetSummarySettingsModule,
-			);
-		};
 	};
-	3F2FDB0706B4943500A80064 = {
+	3F10FD0606CC4D6D00A80064 = {
 		fRef = F586ED0005CB576C017C67C1;
 		isa = PBXTextBookmark;
-		name = "preferences.applescript: 122";
+		name = "preferences.applescript: 144";
 		rLen = 0;
-		rLoc = 5321;
+		rLoc = 6066;
 		rType = 0;
-		vrLen = 2032;
-		vrLoc = 607;
+		vrLen = 2066;
+		vrLoc = 40;
 	};
-	3F2FDB0806B4943500A80064 = {
+	3F10FD0806CC4D6D00A80064 = {
 		isa = PBXTargetBookmark;
 		trg = 29B97326FDCFA39411CA2CEA;
-		uiCtxt = {
-			TOCViewDetailVisibleRect = "{{0, 0}, {590, 233}}";
-			TOCViewExpandedItems = (
-				"com.apple.target-editor-pane.settings",
-				"com.apple.target-editor-pane.settings.simple",
-				"com.apple.target-editor-pane.info-plist",
-				"com.apple.target-editor-pane.info-plist.simple",
-				"com.apple.target-editor-pane.buildphases",
-			);
-			TOCViewMasterVisibleRect = "{{0, 0}, {235, 607}}";
-			TOCViewSelectedItems = (
-				PBXTargetSummarySettingsModule,
-			);
-		};
 	};
-	3F2FDB0906B4943500A80064 = {
+	3F10FD0906CC4D6D00A80064 = {
+		fRef = DA206CF3015C4E8B03C91932;
+		isa = PBXTextBookmark;
+		name = "MacGPSBabel.applescript: 301";
+		rLen = 0;
+		rLoc = 14214;
+		rType = 0;
+		vrLen = 1839;
+		vrLoc = 0;
+	};
+	3F10FD0A06CC4D6D00A80064 = {
 		fRef = F586ED0005CB576C017C67C1;
 		isa = PBXTextBookmark;
 		name = "preferences.applescript: 144";
 		rLen = 0;
 		rLoc = 6066;
 		rType = 0;
-		vrLen = 1949;
-		vrLoc = 4117;
+		vrLen = 2106;
+		vrLoc = 40;
+	};
+	3F10FD0B06CC4D6D00A80064 = {
+		fRef = DA206CF3015C4E8B03C91932;
+		isa = PBXTextBookmark;
+		name = "MacGPSBabel.applescript: 301";
+		rLen = 0;
+		rLoc = 14214;
+		rType = 0;
+		vrLen = 1839;
+		vrLoc = 0;
+	};
+	3F10FD0C06CC4D6D00A80064 = {
+		fRef = F586ED0005CB576C017C67C1;
+		isa = PBXTextBookmark;
+		name = "preferences.applescript: 144";
+		rLen = 0;
+		rLoc = 6066;
+		rType = 0;
+		vrLen = 2066;
+		vrLoc = 40;
+	};
+	3F2FDB0806B4943500A80064 = {
+		isa = PBXTargetBookmark;
+		trg = 29B97326FDCFA39411CA2CEA;
 	};
 	3F579AB40645EEDF007C6F93 = {
 		fRef = DA206CF3015C4E8B03C91932;
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 426";
 		rLen = 0;
-		rLoc = 18393;
+		rLoc = 20376;
 		rType = 0;
 		vrLen = 1839;
 		vrLoc = 0;
@@ -813,15 +1159,35 @@
 		vrLen = 281;
 		vrLoc = 0;
 	};
-	3F7037A506B335A800A80064 = {
+	3F5F093C06B4953400A80064 = {
+		fRef = F586ED0005CB576C017C67C1;
+		isa = PBXTextBookmark;
+		name = "preferences.applescript: 144";
+		rLen = 0;
+		rLoc = 6066;
+		rType = 0;
+		vrLen = 1949;
+		vrLoc = 4117;
+	};
+	3F6587EE06CE7003007C6F9A = {
 		fRef = DA206CF3015C4E8B03C91932;
 		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 301";
+		name = "MacGPSBabel.applescript: 23";
 		rLen = 0;
-		rLoc = 13627;
+		rLoc = 838;
 		rType = 0;
-		vrLen = 1634;
-		vrLoc = 12662;
+		vrLen = 1839;
+		vrLoc = 0;
+	};
+	3F6587EF06CE7003007C6F9A = {
+		fRef = DA206CF3015C4E8B03C91932;
+		isa = PBXTextBookmark;
+		name = "MacGPSBabel.applescript: 654";
+		rLen = 0;
+		rLoc = 28253;
+		rType = 0;
+		vrLen = 1669;
+		vrLoc = 18774;
 	};
 	3F7037A606B335A800A80064 = {
 		fRef = 089C165DFE840E0CC02AAC07;
@@ -858,7 +1224,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 301";
 		rLen = 0;
-		rLoc = 13627;
+		rLoc = 14214;
 		rType = 0;
 		vrLen = 1634;
 		vrLoc = 12662;
@@ -890,7 +1256,7 @@
 		rLen = 0;
 		rLoc = 5321;
 		rType = 0;
-		vrLen = 1911;
+		vrLen = 1874;
 		vrLoc = 4192;
 	};
 	3F9319EA06AF4FA500A80064 = {
@@ -898,7 +1264,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 426";
 		rLen = 0;
-		rLoc = 18393;
+		rLoc = 20376;
 		rType = 0;
 		vrLen = 1594;
 		vrLoc = 15551;
@@ -922,7 +1288,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 426";
 		rLen = 0;
-		rLoc = 18393;
+		rLoc = 20376;
 		rType = 0;
 		vrLen = 1839;
 		vrLoc = 0;
@@ -934,7 +1300,7 @@
 		rLen = 0;
 		rLoc = 6066;
 		rType = 0;
-		vrLen = 1911;
+		vrLen = 1874;
 		vrLoc = 4192;
 	};
 	3FB94847069C744B00A80064 = {
@@ -942,7 +1308,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 426";
 		rLen = 0;
-		rLoc = 18393;
+		rLoc = 20376;
 		rType = 0;
 		vrLen = 1955;
 		vrLoc = 350;
@@ -954,7 +1320,7 @@
 		rLen = 0;
 		rLoc = 6066;
 		rType = 0;
-		vrLen = 1911;
+		vrLen = 1874;
 		vrLoc = 4192;
 	};
 	3FB94849069C744B00A80064 = {
@@ -962,7 +1328,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 426";
 		rLen = 0;
-		rLoc = 18393;
+		rLoc = 20376;
 		rType = 0;
 		vrLen = 1594;
 		vrLoc = 15551;
@@ -992,7 +1358,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 606";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 1782;
 		vrLoc = 9262;
@@ -1056,7 +1422,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 564";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 1497;
 		vrLoc = 0;
@@ -1096,7 +1462,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 328";
 		rLen = 0;
-		rLoc = 16002;
+		rLoc = 17059;
 		rType = 0;
 		vrLen = 1498;
 		vrLoc = 0;
@@ -1186,7 +1552,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 426";
 		rLen = 0;
-		rLoc = 18393;
+		rLoc = 20376;
 		rType = 0;
 		vrLen = 2463;
 		vrLoc = 1202;
@@ -1304,7 +1670,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 568";
 		rLen = 0;
-		rLoc = 25534;
+		rLoc = 27531;
 		rType = 0;
 		vrLen = 1904;
 		vrLoc = 23011;
@@ -1362,7 +1728,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 554";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 1511;
 		vrLoc = 14316;
@@ -1396,7 +1762,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 556";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 1495;
 		vrLoc = 0;
@@ -1416,7 +1782,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 245";
 		rLen = 0;
-		rLoc = 12962;
+		rLoc = 13549;
 		rType = 0;
 		vrLen = 1811;
 		vrLoc = 11141;
@@ -1436,7 +1802,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 245";
 		rLen = 0;
-		rLoc = 12962;
+		rLoc = 13549;
 		rType = 0;
 		vrLen = 1795;
 		vrLoc = 11141;
@@ -1456,7 +1822,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 245";
 		rLen = 0;
-		rLoc = 12962;
+		rLoc = 13549;
 		rType = 0;
 		vrLen = 1773;
 		vrLoc = 9896;
@@ -1476,7 +1842,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 528";
 		rLen = 1109;
-		rLoc = 23829;
+		rLoc = 25826;
 		rType = 0;
 		vrLen = 2083;
 		vrLoc = 20945;
@@ -1496,7 +1862,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 543";
 		rLen = 543;
-		rLoc = 24939;
+		rLoc = 26936;
 		rType = 0;
 		vrLen = 2083;
 		vrLoc = 20945;
@@ -1516,7 +1882,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 557";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 1436;
 		vrLoc = 21697;
@@ -1530,7 +1896,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 564";
 		rLen = 161;
-		rLoc = 25535;
+		rLoc = 27532;
 		rType = 0;
 		vrLen = 1973;
 		vrLoc = 22760;
@@ -1550,7 +1916,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 577";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 1728;
 		vrLoc = 16243;
@@ -1570,7 +1936,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 577";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 1774;
 		vrLoc = 13079;
@@ -1610,7 +1976,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 318";
 		rLen = 0;
-		rLoc = 16002;
+		rLoc = 17059;
 		rType = 0;
 		vrLen = 1766;
 		vrLoc = 13015;
@@ -1640,7 +2006,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 556";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 1497;
 		vrLoc = 0;
@@ -1670,7 +2036,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 572";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 2257;
 		vrLoc = 782;
@@ -1690,7 +2056,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 572";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 2240;
 		vrLoc = 332;
@@ -1722,7 +2088,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 577";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 1728;
 		vrLoc = 16243;
@@ -1800,7 +2166,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 562";
 		rLen = 0;
-		rLoc = 25482;
+		rLoc = 27479;
 		rType = 0;
 		vrLen = 1973;
 		vrLoc = 22760;
@@ -1814,7 +2180,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 518";
 		rLen = 0;
-		rLoc = 22694;
+		rLoc = 24691;
 		rType = 0;
 		vrLen = 1965;
 		vrLoc = 21930;
@@ -1838,7 +2204,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 575";
 		rLen = 0;
-		rLoc = 26256;
+		rLoc = 28253;
 		rType = 0;
 		vrLen = 2154;
 		vrLoc = 21908;
@@ -1850,7 +2216,7 @@
 		rLen = 0;
 		rLoc = 4270;
 		rType = 0;
-		vrLen = 1911;
+		vrLen = 1874;
 		vrLoc = 4192;
 	};
 }
diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/project.pbxproj b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/project.pbxproj
index e2825c35a..d7d4e509f 100644
--- a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/project.pbxproj
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/project.pbxproj
@@ -262,7 +262,7 @@
 	<key>CFBundleSignature</key>
 	<string>mGPS</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>
-- 
2.30.2